Cleanup root directory #2210
Cleanup root directory #2210
Conversation
| @@ -498,7 +498,7 @@ ADD_CUSTOM_TARGET(dist | |||
| COMMAND make clean | |||
| COMMAND rm -rf "${TMP}" | |||
| COMMAND mkdir -p "${TMP}" | |||
| COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}" | |||
There was a problem hiding this comment.
Explanation: These are now moved into directories that are copied recursively, no need for explicitly copying them.
| @@ -498,7 +499,7 @@ ADD_CUSTOM_TARGET(dist | |||
| COMMAND make clean | |||
| COMMAND rm -rf "${TMP}" | |||
| COMMAND mkdir -p "${TMP}" | |||
| COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}" | |||
| COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL README.md TODO "${TMP}" | |||
There was a problem hiding this comment.
Since COPYING was renamed to LICENSE.txt, does this line need to be updated as well?
There was a problem hiding this comment.
Also, should TODO and configure be removed, as well as build_mingw32/64 since they were moved to a different directory just like the lmms.* files?
There was a problem hiding this comment.
@Wallacoloo : Done, done and done via tresf@95f0b29. Also removed configure
tresf
force-pushed
the
2201-root-refactor
branch
from
1545930 to
29c809b
Compare
tresf
force-pushed
the
2201-root-refactor
branch
4 times, most recently
from
4a1cd1d to
cfcdd5e
Compare
|
Ok, I've started to do the I'm sure I have something I missed, but so far it looks like everything should compile. If you look at how the platform-specific packaging logic can now be removed from Feedback welcome. -Tres |
tresf
force-pushed
the
2201-root-refactor
branch
7 times, most recently
from
6bd14a8 to
9fe9517
Compare
|
@curlymorphic @Wallacoloo I'll be merging this soon. I'm having a bit of an issue with some of the paths (i.e. https://github.com/tresf/lmms/blob/2201-root-refactor/cmake/nsis/CMakeLists.txt#L2) which I'm still trying to iron out, but any feedback before this is merged is greatly appreciated. |
|
... in addition, |
|
@tresf I won't be able to seriously test this anytime. I'll make sure I can
at least still do a build with this later this afternoon though.
Merge it whenever you think it's time - I won't be upset if it breaks
anything.
|
|
@tresf builds fine (in both gcc and clang) for me & verified that it loads projects, outputs audio, and exports wavs correctly. I don't see any blaring errors in your edits to the build tools, but I only skimmed the changes. |
tresf
force-pushed
the
2201-root-refactor
branch
from
f644c2a to
df1508d
Compare
|
Ok, I think I figured out the packaging problems per tresf@df1508d. -Tres |
|
And @Wallacoloo thanks for the testing and vote of confidence. I'll probably squash these later in the day and merge. |
tresf
force-pushed
the
2201-root-refactor
branch
from
df1508d to
c8e3e4e
Compare
Cleans up the root directory of the GitHub source tree and starts to separate platform-specific installing and packaging logic from the master CMakeLists.txt. Closes LMMS#2201
tresf
force-pushed
the
2201-root-refactor
branch
from
c8e3e4e to
3114cce
Compare
|
With some brute force, was able to sync and squash. Should be ready to merge now that all of the bugs are fixed. |
|
Tested on Mac, Wine, Linux, updated documentation, merging. |
Closes #2201